styleproperties: Really don't use 'i' in inner loop
authorBenjamin Otte <otte@redhat.com>
Sun, 20 Mar 2016 12:42:18 +0000 (13:42 +0100)
committerBenjamin Otte <otte@redhat.com>
Sun, 20 Mar 2016 12:43:46 +0000 (13:43 +0100)
I apparently was too tired when doing
8cebc125da7e3f9c49a6d4e0ea5320c11b7c21af and forgot to replace one
instance of 'i' with 'j'.

Thanks Timm for finding that one.

gtk/deprecated/gtkstyleproperties.c

index e65115018ac72fcf7987a3504e54855670790882..30aac876a778e53f44587d2c55277889e1cca5df 100644 (file)
@@ -932,7 +932,7 @@ gtk_style_properties_merge (GtkStyleProperties       *props,
               array = g_value_get_boxed (_gtk_css_typed_value_get (value->value));
               array_to_merge = g_value_get_boxed (_gtk_css_typed_value_get (data->value));
 
-              for (i = 0; j < array_to_merge->len; j++)
+              for (j = 0; j < array_to_merge->len; j++)
                 g_ptr_array_add (array, g_ptr_array_index (array_to_merge, j));
             }
           else if (replace || value->value == NULL)